From f67ccb061496e4658aa7ea33c24a74dffd189f99 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Wed, 14 Dec 2005 01:25:07 +0100 Subject: [PATCH] Clarify the BSD-ish licenses for the blk and net front-end drivers so that it is clear they are fully GPL-compatible and satisfy the free software definitions in include/linux/module.h. Signed-off-by: Keir Fraser Signed-off-by: Stephen Tweedie --- linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c | 9 ++++++--- linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c index 6c9e5b6480..7140449af1 100644 --- a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c +++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c @@ -10,8 +10,11 @@ * Copyright (c) 2005, Christopher Clark * Copyright (c) 2005, XenSource Ltd * - * This file may be distributed separately from the Linux kernel, or - * incorporated into other software packages, subject to the following license: + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation; or, when distributed + * separately from the Linux kernel or incorporated into other + * software packages, subject to the following license: * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this source file (the "Software"), to deal in the Software without @@ -820,7 +823,7 @@ static void xlblk_exit(void) } module_exit(xlblk_exit); -MODULE_LICENSE("BSD"); +MODULE_LICENSE("Dual BSD/GPL"); /* diff --git a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c index 3115c5dafa..e9b3610690 100644 --- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c +++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c @@ -4,8 +4,11 @@ * Copyright (c) 2002-2005, K A Fraser * Copyright (c) 2005, XenSource Ltd * - * This file may be distributed separately from the Linux kernel, or - * incorporated into other software packages, subject to the following license: + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation; or, when distributed + * separately from the Linux kernel or incorporated into other + * software packages, subject to the following license: * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this source file (the "Software"), to deal in the Software without @@ -1294,7 +1297,7 @@ static void netif_exit(void) } module_exit(netif_exit); -MODULE_LICENSE("BSD"); +MODULE_LICENSE("Dual BSD/GPL"); /* ** /proc **/ -- 2.30.2